Revert C/S 20966 "Disable memory mapping warnings when stub domain is used."

It was ealier resolved by C/S 20720 and C/S 20751.
This fix was backported to xen-3.4-testing.

Signed-off-by: Daniel Kiper <dkiper@net-space.pl>

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index adb7396d860232258f53460d355f5b640e5a1eae..5e37bb01d4907c3f0516bd7bb4df3a2cac634831 100644 (file)
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2607,11 +2607,9 @@ int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn)
     {
         /* Don't complain if we're in HVM and there are some extra mappings: 
          * The qemu helper process has an untyped mapping of this dom's RAM 
-         * and the HVM restore program takes another. Additionally, if stub
-         * domain is active then it also has an untyped mapping of original
-         * domain's RAM. */
+         * and the HVM restore program takes another. */
         if ( !(shadow_mode_external(v->domain)
-               && (page->count_info & PGC_count_mask) <= 4
+               && (page->count_info & PGC_count_mask) <= 3
                && (page->u.inuse.type_info & PGT_count_mask) == 0) )
         {
             SHADOW_ERROR("can't find all mappings of mfn %lx: "